From: Ian Campbell <ian.campbell@citrix.com>
Date: Tue, 12 Apr 2011 12:41:43 +0000 (+0100)
Subject: tools: hvmloader: rename roms.h to roms.inc
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=79388968edd323ef57e8b1ba4d81c5b8f2dc0de2;p=xen.git

tools: hvmloader: rename roms.h to roms.inc

It's not really a header, it's an autogenerated data file.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
---

diff --git a/.hgignore b/.hgignore
index 20472a8d27..2c2dc4bd3e 100644
--- a/.hgignore
+++ b/.hgignore
@@ -143,7 +143,7 @@
 ^tools/firmware/hvmloader/acpi/dsdt.*\.c$
 ^tools/firmware/hvmloader/acpi/ssdt_.*\.h$
 ^tools/firmware/hvmloader/hvmloader$
-^tools/firmware/hvmloader/roms\.h$
+^tools/firmware/hvmloader/roms\.inc$
 ^tools/firmware/rombios/BIOS-bochs-[^/]*$
 ^tools/firmware/rombios/_rombios[^/]*_\.c$
 ^tools/firmware/rombios/rombios[^/]*\.s$
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 105fecdc0e..d755e76a11 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -51,7 +51,7 @@ endif
 all: subdirs-all
 	$(MAKE) hvmloader
 
-hvmloader.o: roms.h
+hvmloader.o: roms.inc
 smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(shell date +%m/%d/%Y)\""
 
 hvmloader: $(OBJS) acpi/acpi.a
@@ -59,22 +59,25 @@ hvmloader: $(OBJS) acpi/acpi.a
 	$(OBJCOPY) hvmloader.tmp hvmloader
 	rm -f hvmloader.tmp
 
-roms.h: $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) ../etherboot/eb-roms.h
+roms.inc: $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) ../etherboot/eb-roms.h
+	echo "/* Autogenerated file. DO NOT EDIT */" > roms.inc
+
 ifneq ($(ROMBIOS_ROM),)
-	sh ./mkhex rombios $(ROMBIOS_ROM) > roms.h
+	sh ./mkhex rombios $(ROMBIOS_ROM) >> roms.inc
 endif
+
 ifneq ($(STDVGA_ROM),)
-	sh ./mkhex vgabios_stdvga $(STDVGA_ROM) >> roms.h
+	sh ./mkhex vgabios_stdvga $(STDVGA_ROM) >> roms.inc
 endif
 ifneq ($(CIRRUSVGA_ROM),)
-	sh ./mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> roms.h
+	sh ./mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> roms.inc
 endif
 
-	cat ../etherboot/eb-roms.h >> roms.h
+	cat ../etherboot/eb-roms.h >> roms.inc
 
 .PHONY: clean
 clean: subdirs-clean
-	rm -f roms.h acpi.h
+	rm -f roms.inc acpi.h
 	rm -f hvmloader hvmloader.tmp *.o $(DEPS)
 
 -include $(DEPS)
diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c
index e1db09fe53..09bc5a3312 100644
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -20,7 +20,6 @@
  * Place - Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "roms.h"
 #include "acpi/acpi2_0.h"
 #include "util.h"
 #include "hypercall.h"
@@ -33,6 +32,8 @@
 #include <xen/hvm/ioreq.h>
 #include <xen/memory.h>
 
+#include "roms.inc"
+
 asm (
     "    .text                       \n"
     "    .globl _start               \n"